workspace: Don't restrict title width to window preview

Now that only one window title is visible at any time, it no longer
matters if a title extends into other window previews, so we can
always show the full title.

https://bugzilla.gnome.org/show_bug.cgi?id=783953

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 7399a6e1c1c9bafcf1413a880019b4d00e33677a..37425d31f2d2221ac9691efe66514cd4a535cbcf 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -538,24 +538,13 @@ var WindowOverlay = new Lang.Class({
         else
             button.set_position(Math.floor(buttonX), Math.floor(buttonY));
 
-        // Clutter.Actor.get_preferred_width() will return the fixed width if one
-        // is set, so we need to reset the width by calling set_width(-1), to forward
-        // the call down to StLabel.
-        // We also need to save and restore the current width, otherwise the animation
-        // starts from the wrong point.
-        let prevTitleWidth = title.width;
-        title.set_width(-1);
-        let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
-        let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
-        title.width = prevTitleWidth;
-
-        let titleX = cloneX + (cloneWidth - titleWidth) / 2;
+        let titleX = cloneX + (cloneWidth - title.width) / 2;
         let titleY = cloneY + cloneHeight - (title.height - this.borderSize) / 2;
 
-        if (animate)
-            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), titleWidth);
-        else {
-            title.width = titleWidth;
+        if (animate) {
+            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), title.width);
+        } else {
+            title.width = title.width;
             title.set_position(Math.floor(titleX), Math.floor(titleY));
         }